From 6f87cf9311224f616125c58f0ff77ebe571fa6ef Mon Sep 17 00:00:00 2001 From: "hollisb@us.ibm.com[iap10]" Date: Mon, 18 Apr 2005 20:58:15 +0000 Subject: [PATCH] bitkeeper revision 1.1159.258.99 (42641f67D11Zf7wIb-qAVu9io6tamQ) [PATCH] IO-APIC in drivers/pci/quirks.c This patch moves the IO-APIC include inside #ifdef CONFIG_X86_IO_APIC , which is how Linux 2.6 has it. This is needed for architectures without asm/io_apic.h. I've verified that x86 still builds; please apply. Signed-off-by: Hollis Blanchard ===== xen/drivers/pci/quirks.c 1.9 vs edited ===== --- BitKeeper/etc/logging_ok | 1 + xen/drivers/pci/quirks.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 14fc0992ae..f5ca0d0fc9 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -20,6 +20,7 @@ djm@kirby.fc.hp.com doogie@brainfood.com gm281@boulderdash.cl.cam.ac.uk gm281@tetrapod.cl.cam.ac.uk +hollisb@us.ibm.com iap10@freefall.cl.cam.ac.uk iap10@labyrinth.cl.cam.ac.uk iap10@nidd.cl.cam.ac.uk diff --git a/xen/drivers/pci/quirks.c b/xen/drivers/pci/quirks.c index 71c0bb428d..25de96ba44 100644 --- a/xen/drivers/pci/quirks.c +++ b/xen/drivers/pci/quirks.c @@ -18,7 +18,6 @@ #include #include #include -#include #undef DEBUG @@ -333,6 +332,8 @@ static void __init quirk_vt82c686_acpi(struct pci_dev *dev) #ifdef CONFIG_X86_IO_APIC +#include + /* * VIA 686A/B: If an IO-APIC is active, we need to route all on-chip * devices to the external APIC. -- 2.30.2